Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:59:12 +0000 (05:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:59:12 +0000 (05:59 +0000)

Trivial merge